Merge branch 'upstream-experimental' into experimental
authorBernd Zeimetz <bernd@bzed.de>
Wed, 28 Jan 2009 12:58:48 +0000 (13:58 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 28 Jan 2009 12:58:48 +0000 (13:58 +0100)

Trivial merge